merge
authorIan Campbell <ian.campbell@xensource.com>
Thu, 30 Nov 2006 13:05:27 +0000 (13:05 +0000)
committerIan Campbell <ian.campbell@xensource.com>
Thu, 30 Nov 2006 13:05:27 +0000 (13:05 +0000)

Trivial merge